Fixed more typos, added cinder support