Improve forms, descriptions. Bug fixes.