working on fixing pen size bug
highlighting works
merge
merge