Further form fixes, need to work on details