Added M55 M54 support such as it is and cleaned up other stuff