new forms fix bugs