todo++
minor whitespace cleanup
added search functionality