minor updates and improvments