first commit - fixed build errors