Fixed small bugs, exchanged Vector for LinkedList