The final push. quick bug fixes.