Updated fringe file and tided up code

Stuff