Added a few more locations and nicks