0.2.5a beta, more performance tweaks