fixing bugs
13 files changed