Fixed more bugs in the source file.