Some work on making TLE code more readable; started work on multilayer map