fixed bugs for 1.3, added -c