Cleaned up comments
Moved simulator to separate thread (needs cleaning)