Work on brush fixes #14