fixes
code simplified