few moar band things (/shap and fix to a few things