3.0.2.2(.d)

Some revisions + debug