organization / implementation

I  organized a bit the code, and created the option to disable draw Q.