added rudimentary search, improved formatting