Added comments, improved search