DOB Works now!

Also edited some other files