Fix things and add manual from Chris