So many bugfixes and tweaks.