fixies
some additions.
cleanup