misc changes (WIP)