Finishing touches to the code (until more glitches pop up and/or we get to work on this in the future).