bugs fixed
12 files changed