added some dev flag stuff for debugs