Finishing changing conformation to confirmation

Also added some javadocs