Fixes and vocab