General optimizations, parts of Mt Moon added