Moar changes, bugfixes.