beta code complete; still minor bugs