Minor fixes, and added exception handling frame, basic HTML checking