fixing a few problems/bugs here and there
Merge branch '620_slhc10_phase1' of https://github.com/emiglior/usercode into 620_slhc10_phase1