Various improvements made by vaz-ar