Bug fixes & improvement to Droppr