more updates, not quite finished