Cleanup, add map, and add toroidial to js