Visual fixes, main thing near final