make sure functions are defined before you use them... duh
Merge branch 'v2' into draghandle