A  few fixes
a few more fixes
even more fixes