Added commands for Aspect parameters and other cleanup