fixed some usage bugs.