Minor changes & setting up