Some stupid minor changes also p=main
Good!