fixes
whatuwant block
merge