small general changes