Fixed a few lingering bugs and got the new annotation types working with the neural package.