Major Performance improvements

Ask me if you want details on what I did