fixed everything and made it look nicer too :3