Improves and fixs