Small changes and add community npcs