edit and comment configuration; add build option to build w/ O2