dep update, minor changes, bug fixes