complete issue #2
fix issue #1
misc updates