Fix incorrect licensing and add missing parens after else.