Fixed a few awfull mistakes