Few small changes

Getting ready for zone clicking