simplify import sensors and actuators
cleanup
fixes + cleanup