small updates to improve performance