BUGFIXES beCAUSE IM finally  SOBER