Added Restart ability and Bug fixes