Small tweaks to system setup
Adding placeholder for final chapter