Further parser changes + internal handling improvments