new toast handling and some database changes