Fixed up the options a bit, started adding different API calls