adding maas and other various changes to internals