Update folder name. Fix small bugs.