Some fixes, added drops