added support for args bundle and fixed bugs