Improved Build Flags

Signed-off-by: Paul Keith <javelinanddart@gmail.com>
Revert "Put back BLN code wiped out from previous revers of s2w,d2w, etc."

This reverts commit ec508f6a20165c79bf9b37e4b5f09b7a816d1911.

Signed-off-by: Paul Keith <javelinanddart@gmail.com>