some more hacking, entry and the like mostly