added final card and some small changes