extra curricular and bug fixes