fixed some interesting problems i was having due to commit issue