Added restart feature
Fixed typo
Merge branch 'fix'
Improved collisions