Fixed integer operation bug; improved EDA