Adding settings suite and other minor modification