more bugfixes, woohoo.
Updates updates updates...