another batch of last minute fixes