Finished up needed features.