Finished up Lab13, other minor updates