Added some fixes
working things