Patch 55 & some typos