fixed parse issues, and modified assoc and dissoc