Improves and small fixes