Fixed missing $ signs from certain variables