Fixed some API stuff, make it easier to iteract