Fixed item naming convention and typo. Also fixes a few drop bugs