Tweaked template parsing and added basic form data parsing