misc changes not committed yet