Fixing some issues with syntax and wrong vars