More pretty looks and error handling