misc changes (broken)