General form improvements