fixed few flaws #50

Closed manishavi closed 6 years ago