Added more parsing functions; cleaned up some display code