few changes in build and settings