change: cleaning of bugs