Numerous Bugfixes, Staff Refactoring.