update several dependencies

Updates several dependencies and makes minor changes to keep things working.