fixed search, minor style fixes