updated script variables and added todo's