Simplified error handling, link and font fixes