added and fixed oh so much