Removed gdml dependencies. Made various other small fixes. Should work...