Added drawing selection ping and did a bunch of cleanup.