Resume update & minor bug fix