Fixed a few bugs and made it faster