Added comments and non-functional parser