Cleanup and testing

Added software limits for arm.