(hopefully) final (hopefully) improvements