major cleanup
autolift wip