cleanup and html control fix