Fixed syntax issues

Excluded annotation shortcuts in last version: Assume user will
accurately input generation specifications