improves, fixes