Rushing, fixed some micro