fixed bugs, updated variable naming