Added a bit of array stuff, some more syntax changes.