testing changes and a lot of fixes for barclamp oat