Missing files added. Bug fixes