Some cleanup
Some test harnesses
Fix search
1.3.3