Drafted sec on con apps; more clean up