Base saving, various improvements

+ Uses last core refactor.