- improving and cleaning up for alpha7