added more bug/defects