check in as-is
fold updates
fix config files