Happy B'Day fixes and EC

Fixes to Happy Birthday and part a of Extra Credit