change capitalization of instances, fix minor issues