moar bugfixes to get a working model