Small Update with fixes