added things

added things that were lost during merge