Various 5ml FS/Swap

completed