fixes and linked list merge