more updates, may be useable now