Case sesitive parsing + EOF fix