Update core
Update
*Fix some bugs