fixes and extra swap option