Minor Changes & Updates