various updates

The three below JIRAs are related to each other:
* [AGJS-55](https://issues.jboss.org/browse/AGJS-56)
* [AGJS-56](https://issues.jboss.org/browse/AGJS-56)
* [AGJS-58](https://issues.jboss.org/browse/AGJS-58)

This PR addresses them.