Corrections on .l; new structs on .h; new rules