Some littel improvements