fixed errors. no new functions yet