Made a lot of changes and improvements. Trying to keep the code clean, at least cleaner than the LandSpec code.