Misc changes, no real progress