#9 bug fixes, added help