little tweaks to fix some bugs :bug: :bug: