House cleaning; added maps; optimizations