more updates, polishing