Various changes
-Minor changes