Minor improvements, a bugfix or two, few changes in functionality