Updating exceptions, documentation, formatting