added basic gen/check features