Fix errors and enhachesd forms