Added and fixed some thing's