tons of fixes all around