Config and general cleanup changes