Fixes "a few bugs"


More...