Fixing the main methods
Speed up mapping and reducing like 10x haha
Update README.md
Merge remote-tracking branch 'origin' into pis