complete device mapper class
minor fixes