Fix/sim usim problems

Yeah! Cool, if it works, remove commented code.