Polished up more code issues.