fixed critical bugs (wip)
fixed minor bug
fixed typo
Merge branch 'colllision-test'