Minor doc, syntax, bugfixes and tweaks