Code cleanup
Add dot names
More code cleaning
Added touch handling for dots