Updates: Add some minor tweak for more user friendly programme