Added comments and new alias
invisible chars
merge fix