bug fixes

cleaner dependencies