trying to fix form bugs