minor improvements, about to add get opts, added evaluation of constants and referencing them