Fixed motors and battery in response to comments