consistent capitalization in debugging output
oops
simplify & clean up
Merge branch 'master' into access_spec