Adjust variable names and comments for clarity
Fix weap plugin