fixing dimension annotation bugs.
Merge branch 'devo'