cleaned up some names. set a TODO to work on right now.