Added more rules. Fixed function call and definition rules