More changes - not finished

still needs additions for el locale