Mihir | Fixing lots of stuff