Added Overlays and other major enhancements