updated a bit
polish
merged in master