touching up some more stuff