add cinder and fix bugs