small bugfix, cleanup of imports

still not working as intended everywhere <.<