cleanup, fixes after merge