Small changes regarding printing and testing main over 2 computers