Added draggie and other refinements