fixing bugs
Merge branch 'wip'