fixed some stuff
dcdev2