fixed errors, set up to build