additional modifications and fixes post first release / testing