trace more functions and prettify some classes