add logging
tons of changes

yeah, i forgot to commit along the way