form bug cleanup