Some changes and made bool debug dev only