+ some small changes