added todo's and cleaned up a bit