Fixes and Main list list