misc cleanup
got all of the important steps down..just need to add a log index