some more (hopefully) improvements