A lot of improvements I don't remember exactly what I changed