added the rest of variables and conditionals

Added the rest of variables for windows and mac devices and conditional
statements