Several performance tweaks
Version bump