Working on improving legend and fill abilities