fixed and added more stuffssss