Added wraps for tables, position mapping now returns multiples like it should