security fixes + other stuff