Pretty fixes, adding to tests, fixing warnings
Updated version