Improvements including colors and removing insecure