Modified files in src/ and fixed bugs.