some more fixes and cleaning up for gazebo simulation