more merging with twister-calm + fixes