Own-ifying and Bugfixes