Lots of updates and corrections