Bugfixes
Major bugfixes, added primitive loader