some fixes some errors