Fixed some bugs
Version bump to 0.6.9