forms improvements