changes based on things I found in aur apache24 and other places