Added resume and some more fixes