get tests passing
fix some securitystuff