More features, more error handling