refs #4987 some code improvements, added shortcuts and more tweaks