add marked alias
some cleanup