Improving everything, almost ready to go out