couple improvments