Small tweaks, a few more errors to work out