Shortened output, improved wikipedia listing