delete and change small bugs