Change npcs

Last TFS
Bug fixes