Fleshed out more API calls, some cleanup.