Added a few new functions and aliases