some fixes and dependency updates