added some aliases
updated editor settings