20 new deshorteners plus fixing minor bugs