Polishes code for simulators
Quick fixes