Add Kinglet + a few fixes