a few more personal modifications