fixed review remarks, added sample with custom form