Minor updates

Removing the original calc file and replacing with one with 1515 in the
name to make it more clear.

I did modify some of the code to be more parametric and fixed a bug with
the explode for the top.