Tons of misc changes/fixes