commiting a bunch of fixes