fixed issues

accidently merged two commits an hour ago instead of just comiting which
resulted in a big big mess that should be fine now