undo 4a3b to get rid of 'undefined symbols' error
minor changes