More dimension work, cleaned ore gen code