Fixed couple of mini bugs, and starting to grasp wicket.