fix comment
fix unmapping