Updates to previous exercises, general cleanup