more methods return instancetype where applicable

There was just a couple methods still returning id