misc changes (that may or may not work)