dasd fixes #3

asd
Awesome job! Go ahead and merge this back into master.