Patch 6

I've fixed and added a few things. Hey Mark, is it necessary to create a diagonal wave area too? Have they ever been used?