fixes all around, everything seems ok