make_unique added, console fixes