more small bugfixes and temp work