Fiddled with Shapes.java

But didn't make any real progress. Also added comments here and there
for my own understanding.