fixed some buggers after parameter rework