fixes
fixing more errors