<fix> solved a few bugs during the nap :D