Prints and minor fixes