[DEV] many small correction