some hopefully last modifications