minor fixes and cleanups
updating packages #1 (EF)