bug fixes, linked list error :(