1. Add subjects.
2. Some bugs fixed.