Added Princess stuff, bug fixes