lots of fixes and shellchecked