Improved handling of args, addition of autobeaming