Many misc changes