Fixed source highlight, added tests, started pointer references