cleanup, fixes, additions