fixed and updated a few things