more bugfixes; I think it's working...\!