clean up, print added, bug fixed