some cleanup; enlarge hit area on pen