cleaned out old code
fixed errors