Fixed some typos that returned the wrong data, fixed some docblocks