0.β2.4.0

optimizations and cleanups.