added convenience properties, other minor tweaks