styled stuff
merged in master