More fixes, less features. Minor fix release.