more updates, still not finished