adding ST2 support
use better defaults