Working on drawOnData and some fixes