added chitter and alkemy
fixed merge conflicts