Final Final few fixes!