finished up stuff