Last stable merge

ok, slightly happier with the visuals so far...