updates, still not quite finished