Improvements

Several improvements including initialization