Improves header, __init__, features