Various improvements and verifications
Various fixes and partially verified