Add more endpoints, fixes #517

Addresses a) and b)