Some for free, some swap updated

completed