Init

Minor adjustments