more cleanup and refactoring
most of observation editor done on students