Significant fixes made after final feature review