Vikram Menon/vikmenon

Minor changes to files and packages.