Added a renamer and fixed some multiplier analyzation issues.