some simplifications, cl args