final touch- including general comments implementation