minor bugfixes

typos, visibility, de-namespacing