Fixed annotations being carried from one function to another without a docblock start
Various support files added/updated