fixed forms, removed m2m plan=features