removing bugs

final commit