resolves #257; resolves #260