Added 3.5.3 config and fixed a few bugs.