security fix
new feature stuff + bug fix
added stuff