Bug Fixes and unit switching