delt wit a few bugs