removed bugs, and tested most components