*Fix some bugs