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