fix: lots of fixes
Merge branch 'develop' of https://github.com/RaghavRamesh/Hackatron-Asia into develop