bug fixes and new outline datasoure