added drop colors and some optimizations and fixes