changes to things
Merged from older laptop
Added toc