Merge pull request #6 from TomaQ/development

NPCs and QoL changes
cleaned up white space