fixed few issues with machine repair