Update dependcies, some testing, bugfixes