more updates to noter. cleaned up code tremendously.