Various convenience methods added plus minor upgrades