fix/kafka (and locations, etc)

lots of fixes/tidies due to kafka failing

probably best to review this commit by commit as they are grouped so that they make sense
(whereas all in one will be confusing)