cleanup
change warning text; quote some attributes
merge with bb's stuff... hopefully didn't break anything
merge with drag-to-module