cleanup, fixes, additions.