small cahnges
sqlite
fixes to modals
Merge branch 'timsnewbranch'