add defaults; minor fixies