working
more stuffs mainly added the fixxes