fix stupid bug
improve account generation