NIGHTBELL: Update

Bug fixes