Bug fixing, reordering and new stuff in slides

Updated slides!