Added Sine, Square, and a few fixes