bugs fixed
10 files changed