bug fixes, including handling semicolon. Continuing to debug issues.