Added code to handle #import directives, ?: conditional expressions and a couple of small bugfixes