quick multiple bug fixes for challenge q1