Improved error/success messaging, formatting improvements