Major bug fixes, List now working perfectly