Fixed another drawing issue, added sample data generator