some small changes and cleaning up old code - moving machines