some small changes plus additions