General Changes: Added Comment Fields & Formated the code...