updated

4.0 final?

hasnt been tested with search yet...