WIP cleaner arm setup, more L2 features