So, pertaining to the waves, I did manage to get straight lines where they are supposed to be. Now I just need to make them wiggle.
Although, I will admit. I just put my new PC together... and it kicks Crysis's ass. So that is hindering progress considerably.