Partial 2.4.10 Resolve Pending Issues

Prepared a little more for the final two forms