Added comments, made some stuff Final.