Added some things

looks bad, will fix later