Small Improvements + SSL Test