fixed controls - possible bus error?
cleaned up