added some bugs and updated usage info