some changes and add classes, change draw line and circle