Added catalog, static mode, and improvements.