Cleanup rc file and add few missing settings