fixing things that I broke...
accepting changes...