clean up, some material adjustments, added toast service, ...