Highlights, type issues

No longer highlights output. Fixed issues with how types are determined