form fixes + opt