fixed some bugs - noted some new ones