Fixing stuff
Initial upload Nr 3