Various testing and cleanup + other tricks.
More work and tweaks on core features.