Fixed a lot of commited erros lol