Moved parser functions again, edited bell