removed small bugs