Changed Some things and fixed others