Fixed aliases
Fixed line wrapping again