Minor changes and fixes
it works!