Fixes to assignment 3 to stuff that's not relevant anymore