Fixes a few bugs; adds a few utility classes