minor bugs, but variables added