Fixed bugs and ran some experiments