Moved Log drawing
Added logging for fights
Added names to NPC and Player