More aliases and some weird function shit in the source file