Bug fixes, re-structuring, RIPE search.