Finish/fix spinner [closes #53]