fixed little bugs
forgot to add files
merged together