redoing how debug flag is handled
basic toolbar cleanup