fixed creation of swap table
fixed comment location