diff --git a/src/Components/OrderInfo.tsx b/src/Components/OrderInfo.tsx
index 726c017..8be239b 100644
--- a/src/Components/OrderInfo.tsx
+++ b/src/Components/OrderInfo.tsx
@@ -27,7 +27,7 @@ const useStyles = makeStyles({
  */
 interface IOrderInfo {
   OrderId: number;
-  Order: OrderEntity.Order;
+  Order?: OrderEntity.Order;
   Admin?: true;
 }
 
diff --git a/src/Pages/Admin/Order/Append.tsx b/src/Pages/Admin/Order/Append.tsx
index 74dead5..6d6091f 100644
--- a/src/Pages/Admin/Order/Append.tsx
+++ b/src/Pages/Admin/Order/Append.tsx
@@ -29,7 +29,7 @@ const log = new Logger("Admin", "Order", "Detail", "Append");
  * @since 0.5.0
  * @version 0.2.2
  */
-export function AdminOrderAppend({ OrderId, Refresh }: IAdminOrderAppend) {
+export function AdminCommentAppend({ OrderId, Refresh }: IAdminOrderAppend) {
   const style = useStyles();
   const [cmt, setCmt] = useState<string>();
 
diff --git a/src/Pages/Admin/Order/Detail.tsx b/src/Pages/Admin/Order/Detail.tsx
index ae2060b..7ff36b2 100644
--- a/src/Pages/Admin/Order/Detail.tsx
+++ b/src/Pages/Admin/Order/Detail.tsx
@@ -10,7 +10,7 @@ import { ColFlex } from "~/Helpers/Styles";
 import { OrderComment } from "~/Pages/History/Comment";
 import { AdminHub } from "~/ShopNet/Admin";
 import { AdminOrderAction } from "./Action";
-import { AdminOrderAppend } from "./Append";
+import { AdminCommentAppend } from "./Append";
 import { AdminOrderList } from "./List";
 import { Shipment } from "./Ship";
 
@@ -104,7 +104,7 @@ export function AdminOrderDetail({ OrderId }: { OrderId: number; }) {
 
         <OrderComment Comments={data?.Comments} />
 
-        <AdminOrderAppend OrderId={OrderId} Refresh={run} />
+        <AdminCommentAppend OrderId={OrderId} Refresh={run} />
 
         <AdminOrderAction OrderId={OrderId} Status={order?.Status} Refresh={run} />
       </DrawerBody>
diff --git a/src/Pages/History/Append.tsx b/src/Pages/History/Append.tsx
index 4484cb6..b4c03cb 100644
--- a/src/Pages/History/Append.tsx
+++ b/src/Pages/History/Append.tsx
@@ -35,7 +35,7 @@ interface IOrderAppend {
  * @since 0.5.0
  * @version 0.4.2
  */
-export function OrderAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppend) {
+export function CommentAppend({ OrderId, Status, Refresh, ParentLog }: IOrderAppend) {
   const log = useConst(() => ParentLog.With("Append"));
 
   const style = useStyles();
diff --git a/src/Pages/History/Detail.tsx b/src/Pages/History/Detail.tsx
index 545e557..e8b33fd 100644
--- a/src/Pages/History/Detail.tsx
+++ b/src/Pages/History/Detail.tsx
@@ -13,7 +13,7 @@ import { ICompLog } from "~/Helpers/Logger";
 import { ColFlex } from "~/Helpers/Styles";
 import { Hub } from "~/ShopNet";
 import { OrderAction } from "./Action";
-import { OrderAppend } from "./Append";
+import { CommentAppend } from "./Append";
 import { IComment, OrderComment } from "./Comment";
 
 /**
@@ -166,7 +166,7 @@ export function OrderDetail({ OrderId, ParentLog }: { OrderId: number } & ICompL
 
           <OrderComment Comments={data?.Comments} />
 
-          <OrderAppend OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={log} />
+          <CommentAppend OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={log} />
 
           <OrderAction OrderId={OrderId} Status={order?.Status} Refresh={run} ParentLog={log} />
         </div>
diff --git a/src/ShopNet/Order/Entity.ts b/src/ShopNet/Order/Entity.ts
index ebbb059..f33ba4d 100644
--- a/src/ShopNet/Order/Entity.ts
+++ b/src/ShopNet/Order/Entity.ts
@@ -25,6 +25,7 @@ export abstract class OrderEntity extends ShopNet {
    * @author Aloento
    * @since 1.0.0
    * @version 0.1.0
+   * @liveSafe
    */
   public static Order(key: number): Promise<OrderEntity.Order> {
     this.EnsureLogin();
@@ -35,6 +36,7 @@ export abstract class OrderEntity extends ShopNet {
    * @author Aloento
    * @since 1.0.0
    * @version 0.1.0
+   * @liveSafe
    */
   public static Comment(key: number): Promise<OrderEntity.Comment> {
     this.EnsureLogin();