andol : updates following assembly bugs corrections