commiting to fix a few bugs