Simplify LinkedList code; Other fixes
Adjust code to LinkedList changes