removed some obsolete code, tweaked raindrops