-Trash removed
+Some improovements