Add start and end angle to the wheel. Fix some errors and improve block
situations.