added more feature definitions, can leave them pending for now