Tons of fixes, wip new features and List insterting