commit after changes from a while ago - dont remember all