Added a few improvements based on SMACCS.