Lots of updates for Java II week I