Updated

needs some more cosmetic fixes but you know....