Some logo changes and further error reporting imprvements