So many fixes

Fixed many a thing.