Changed default size to 800 x 600, removed debugging code.  Created develop branch in parallel.