fixed 2 bugs made by me
Merge branch 'Krabban'