Improved NAFQA-183. Improvements to CodeRuin plugin