Added some comments to remind me what bugs and other tweaks need to be
made in the future.