more fixes, add resume