more updates, cleanup
adding in some search