Some small changes for temporary raw_input