credits, sensors, actuators, some refactoring