fixed search, some cleanup
version 0.9.0