Fixed variables (removed '$') and added '@' to prevent commands to output themselves