Added some thingies
updated setup