Updates

Various fixes and updates