bug fixed
some security added