more fixes
form cleanup