clean up and notes on WIP funs