Touched up some bugs