Few bugfixes, finished list rewrite