Bug fixing

Rectangular maps work and some other things