Improved renderer, fixed some package bugs.