Fixed #41, adjusted weight on comeback.