moving stuff around
cleanups, more tests, NormaFind acts more like an array