updated for issue #1

This takes care of #1 #3 #4 #2 can all be closed after this PR