API fixes
Fixed stuff, thanks Divran