Fixes for issue #2 and #3 and #5