Fixed the Bugs and added missing steps