cleanup todo and add more bands