Major adds and improvements