Fixed a few bugs. This is cleanup commit before the whole Orphenaga-System is getting refactored.
Made the whole Orphenage-thingy work.