cleanup, bug fixes, and added comma drop