Move user/group creation earlier
Add useful aliases