Fixed and completed fizz-buzz