some updates from testing
merge from master