change defconf and clean code
Merge branch 'AGK' of https://github.com/antaril/AGK into AGK