Fixed bugs in my code and rounded out things