issue #5 and misc