Added find, other updates?
Merges Tyler's changes into master