Basic entity interaction zone handling added, some cleanup and fixes