small changes
fixes after merge