stronger and safer!

add more functions and safe options