Changes and fixes since last blogpost