Error messages/prints major refactor