Cleaned up simulator, changed initialization