Added brother's house, refactored NPCs