Bumps and cleanups, add l-smash