[fix #rainbowpony] Updates 1 2 and 3