Changed a few things and added other