Minor tweaks and cleanup to .rc