type typo
more significant rewriting in progress