Cleanups, id additions