added two new files
fixed errors in variables
fixed bugs