categories
added *.ldf
added some todos and cleaned up code