Improves and fixes