error messages/routing cleaned up