further structural changes @ no test
miscellaneous *