Update basically everything

see commits for details