- clear up functions
- more PEAR integration
