more testing and maptool updates