+ some minor updates