added ASS support; improved security