corrected some shit that christian made
fixed a conflict that Sune caused