Page 2 and loads of fixes