cleaning up a bit
more notes