Changes for mock 1, and other improvments