add Seed drop and some cleanup
merge