Made some minor changes
Minor changes & bug fixes