fixes for some errors, no major changes