Add last update, fix small bugs