and fixes 3-6 bugs
# general
e
and fixes 3-6 bugs