Updaates and fixes.