clean up in oddstuff
add MoarStuff
merge from master
add DoMasterStuff