minor changes
Tailoring to suit the scope, and implementing Sams comments
Adding the support for A-Forms