Serious tweaks

who knows.