little update
merged with alexzen