More updates; split config system from App