More fixes for #14 and started working on qmarks command from #13