standardized cmd types, other minor tweaks..