added tool cursors, fixed bucket fill