added aliases, updated everything, removed old and unused