error handling and improved consistency
major usability upgrades