Added more syntax. Cleaned up a bit.