fix import issue
merge experimental changes back into mainline touchforms
more compatibility fixes for web start