fixed some dropdown stuff and cleanups