Bugfixes, tweaks, finishing up feautures.