Rewritten man, some other improvements