fixed and finished up most stuff