Fix inconsistencies in comments and error messages for beacon parser per #35