updates
added Tharon's updates