bug fixes, improve performance.