graphic enhancements + error handling