Bug fixes

Changes in this merge:
- Despite being packaged in, I forgot to actually implement the constants
toolkit, so now it's implemented!
- Inverted a few boolean checks that were preventing ids from being assigned