Fixed references to temporary storage

Made sure all the it references temporary storage in all the
appropriate places. Removed print_output