Made things more robust, allows for rc overrides.
0.10.4