Fixes #6, Fixes #7, Fixes #8 -; Multiple minor issues added last night.