somehow intelliJ broke my branch “Kelly” so this is my new branch
small fixes
Merge branch 'Kelly2'
small fixes