Bunch of fixes (inc. maps)