various fixes and enhancements from Luke Petre
various fixes and enhancements from Luke Petre

stefanseefeld/synopsis,stefanseefeld/synopsis,stefanseefeld/synopsis,stefanseefeld/synopsis,stefanseefeld/synopsis,stefanseefeld/synopsis