Add multiple tricks
Small fixes