Doing some cleanup
Fixed the weird brush behavior.