Finished up the conditional and added missing ;'s