revert list to previous version + bug fixes