API tested, fixed