Finally ironed out all the god damn problems

good work André :)