Bug Squashing. Still more work todo tomorrow :)