Fixed bugs and added no-argument option