fixes for challenge