diff --git a/src/commands/animal.ts b/src/commands/animal.ts
index b3e0dd1..d637dd2 100644
--- a/src/commands/animal.ts
+++ b/src/commands/animal.ts
@@ -3,66 +3,74 @@ import { getStrings } from '../plugins/checklang';
 import { isOnSpamWatch } from '../spamwatch/spamwatch';
 import spamwatchMiddlewareModule from '../spamwatch/Middleware';
 import axios from 'axios';
+import { Context } from 'telegraf';
 
 const spamwatchMiddleware = spamwatchMiddlewareModule(isOnSpamWatch);
 
 export default (bot) => {
-  bot.command("duck", spamwatchMiddleware, async (ctx) => {
-    const Strings = getStrings(ctx.from.language_code);
+  bot.command("duck", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
+    const Strings = getStrings(ctx.from?.language_code);
     try {
       const response = await axios(Resources.duckApi);
       ctx.replyWithPhoto(response.data.url, {
         caption: "🦆",
+        // reply_to_message_id works fine, using this for now to avoid errors
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
     } catch (error) {
       const message = Strings.duckApiErr.replace('{error}', error.message);
       ctx.reply(message, {
         parse_mode: 'Markdown',
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
       return;
     }
   });
 
-  bot.command("fox", spamwatchMiddleware, async (ctx) => {
-    const Strings = getStrings(ctx.from.language_code);
+  bot.command("fox", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
+    const Strings = getStrings(ctx.from?.language_code);
     try {
       const response = await axios(Resources.foxApi);
       ctx.replyWithPhoto(response.data.image, {
         caption: "🦊",
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
     } catch (error) {
       const message = Strings.foxApiErr.replace('{error}', error.message);
       ctx.reply(message, {
         parse_mode: 'Markdown',
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
       return;
     }
   });
 
-  bot.command("dog", spamwatchMiddleware, async (ctx) => {
-    const Strings = getStrings(ctx.from.language_code);
+  bot.command("dog", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
+    const Strings = getStrings(ctx.from?.language_code);
     try {
       const response = await axios(Resources.dogApi);
       ctx.replyWithPhoto(response.data.message, {
         caption: "🐶",
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
     } catch (error) {
       const message = Strings.foxApiErr.replace('{error}', error.message);
       ctx.reply(message, {
         parse_mode: 'Markdown',
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
       return;
     }
   });
 
-  bot.command("cat", spamwatchMiddleware, async (ctx) => {
-    const Strings = getStrings(ctx.from.language_code);
+  bot.command("cat", spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
+    const Strings = getStrings(ctx.from?.language_code);
     const apiUrl = `${Resources.catApi}?json=true`;
     const response = await axios.get(apiUrl);
     const data = response.data;
@@ -72,17 +80,19 @@ export default (bot) => {
       await ctx.replyWithPhoto(imageUrl, {
         caption: `🐱`,
         parse_mode: 'Markdown',
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
     } catch (error) {
       ctx.reply(Strings.catImgErr, {
         parse_mode: 'Markdown',
+        // @ts-ignore
         reply_to_message_id: ctx.message.message_id
       });
     };
   });
 
-  bot.command(['soggy', 'soggycat'], spamwatchMiddleware, async (ctx) => {
+  bot.command(['soggy', 'soggycat'], spamwatchMiddleware, async (ctx: Context & { message: { text: string } }) => {
       const userInput = ctx.message.text.split(' ')[1];
       
       switch (true) {
@@ -91,6 +101,7 @@ export default (bot) => {
             Resources.soggyCat2, {
             caption: Resources.soggyCat2,
             parse_mode: 'Markdown',
+            // @ts-ignore
             reply_to_message_id: ctx.message.message_id
           });
           break;
@@ -98,6 +109,7 @@ export default (bot) => {
         case (userInput === "3" || userInput === "sticker"):
           ctx.replyWithSticker(
             Resources.soggyCatSticker, {
+            // @ts-ignore
             reply_to_message_id: ctx.message.message_id
           });
           break;
@@ -107,6 +119,7 @@ export default (bot) => {
             Resources.soggyCatAlt, {
             caption: Resources.soggyCatAlt,
             parse_mode: 'Markdown',
+            // @ts-ignore
             reply_to_message_id: ctx.message.message_id
           });
           break;
@@ -116,6 +129,7 @@ export default (bot) => {
             Resources.soggyCat, {
             caption: Resources.soggyCat,
             parse_mode: 'Markdown',
+            // @ts-ignore
             reply_to_message_id: ctx.message.message_id
           });
           break;