A few updates, still not finished