Fixed some typos and remaining delays