Cleanup 1

Changed SM names and motor mult stuff