Made some security enhancements and additional prompts