better debug switching
Merging release into master.