did some testing on expedited, changed some bugs.