Various little fixes and changes.